Fix tests with regard to GtkBuilder <requires>.

diff --git a/tests/testheightforwidth.c b/tests/testheightforwidth.c
index 6f78af2d47c7f4c78b774ca615973db6dc592a56..a6b79357fc7212634440fe59645f31316c28b84e 100644 (file)
--- a/tests/testheightforwidth.c
+++ b/tests/testheightforwidth.c
@@ -37,7 +37,7 @@ static TestInterface interfaces[] = {
     "Ellipsizing Labels",
     "Demonstrates how labels will request a natural size in a horizontal space",
     "<interface>"
-    "  <requires lib=\"gtk+\" version=\"3.22\"/>"
+    "  <requires lib=\"gtk\" version=\"3.99\"/>"
     "  <!-- interface-naming-policy project-wide -->"
     "  <object class=\"GtkWindow\" id=\"window\">"
     "    <property name=\"default_width\">450</property>"
@@ -86,7 +86,7 @@ static TestInterface interfaces[] = {
     "Wrapping Label",
     "Demonstrates how a wrapping label can require a height contextual to its allocated width",
     "<interface>"
-    "  <requires lib=\"gtk+\" version=\"3.22\"/>"
+    "  <requires lib=\"gtk\" version=\"3.99\"/>"
     "  <!-- interface-naming-policy project-wide -->"
     "  <object class=\"GtkWindow\" id=\"window\">"
     "    <property name=\"default_width\">300</property>"
@@ -162,7 +162,7 @@ static TestInterface interfaces[] = {
     "Horizontal Box",
     "Demonstrates how a horizontal box can calculate the collective height for an allocated width",
     "<interface>"
-    "  <requires lib=\"gtk+\" version=\"3.22\"/>"
+    "  <requires lib=\"gtk\" version=\"3.99\"/>"
     "  <!-- interface-naming-policy project-wide -->"
     "  <object class=\"GtkWindow\" id=\"window\">"
     "    <property name=\"default_height\">200</property>"
@@ -240,7 +240,7 @@ static TestInterface interfaces[] = {
     "This test demonstrates how \"width-chars\" and \"max-width-chars\" can be used "
     "to effect minimum and natural widths in wrapping labels.",
     "<interface>"
-    "  <requires lib=\"gtk+\" version=\"3.22\"/>"
+    "  <requires lib=\"gtk\" version=\"3.99\"/>"
     "  <!-- interface-naming-policy project-wide -->"
     "  <object class=\"GtkWindow\" id=\"window\">"
     "    <property name=\"default_width\">900</property>"
@@ -334,7 +334,7 @@ static TestInterface interfaces[] = {
     "and also trade height for width.",
     "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
     "<interface>"
-    "  <requires lib=\"gtk+\" version=\"3.22\"/>"
+    "  <requires lib=\"gtk\" version=\"3.99\"/>"
     "  <!-- interface-naming-policy project-wide -->"
     "  <object class=\"GtkWindow\" id=\"window\">"
     "    <property name=\"default_width\">500</property>"
@@ -394,7 +394,7 @@ static TestInterface interfaces[] = {
     "and also trade height for width.",
     "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
     "<interface>"
-    "  <requires lib=\"gtk+\" version=\"3.22\"/>"
+    "  <requires lib=\"gtk\" version=\"3.99\"/>"
     "  <!-- interface-naming-policy project-wide -->"
     "  <object class=\"GtkWindow\" id=\"window\">"
     "    <property name=\"default_width\">400</property>"
@@ -427,7 +427,7 @@ static TestInterface interfaces[] = {
     "This test shows wrapping and ellipsizing text in combo boxes (and consequently in menu items).",
     "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
     "<interface>"
-    "  <requires lib=\"gtk+\" version=\"3.22\"/>"
+    "  <requires lib=\"gtk\" version=\"3.99\"/>"
     "  <!-- interface-naming-policy project-wide -->"
     "  <object class=\"GtkWindow\" id=\"window\">"
     "    <property name=\"default_width\">600</property>"

diff --git a/testsuite/gtk/builder.c b/testsuite/gtk/builder.c
index d57b676d56869ea61f69f7e6ecc0a9e0b10d1d5c..88e25e7229c44f1539c733574617cc2e133da000 100644 (file)
--- a/testsuite/gtk/builder.c
+++ b/testsuite/gtk/builder.c
@@ -1829,7 +1829,7 @@ test_requires (void)
   char       *buffer;
   const char buffer_fmt[] =
     "<interface>"
-    "  <requires lib=\"gtk+\" version=\"%d.%d\"/>"
+    "  <requires lib=\"gtk\" version=\"%d.%d\"/>"
     "</interface>";
 
   buffer = g_strdup_printf (buffer_fmt, GTK_MAJOR_VERSION, GTK_MINOR_VERSION + 1);
@@ -2307,9 +2307,8 @@ test_anaconda_signal (void)
   GtkBuilder *builder;
   const char buffer[] = 
     "<?xml version='1.0' encoding='UTF-8'?>"
-    "<!-- Generated with glade 3.18.3 -->"
     "<interface>"
-    "  <requires lib='gtk+' version='3.12'/>"
+    "  <requires lib='gtk' version='3.99'/>"
     "  <object class='GtkListStore' id='liststore1'>"
     "    <columns>"
     "      <!-- column-name use -->"

diff --git a/testsuite/reftests/animation-direction.ref.ui b/testsuite/reftests/animation-direction.ref.ui
index 5c2f97aaef5851f481091092fc7523a7064704ba..a063b1c6e53e6c04c76ac56805ba97649cfbf365 100644 (file)
--- a/testsuite/reftests/animation-direction.ref.ui
+++ b/testsuite/reftests/animation-direction.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
     <child>

diff --git a/testsuite/reftests/animation-direction.ui b/testsuite/reftests/animation-direction.ui
index bf4e6cb43eba9483c50abf74186ae0667bb5224b..c9bfd74165e748800bafb131c66b532de889819f 100644 (file)
--- a/testsuite/reftests/animation-direction.ui
+++ b/testsuite/reftests/animation-direction.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
     <child>

diff --git a/testsuite/reftests/animation-fill-mode-iteration-count.ref.ui b/testsuite/reftests/animation-fill-mode-iteration-count.ref.ui
index 1287c040c314fc335770311a8823d826d40b78b2..05b6f89d12011855c95aefdfc262981db2df29f9 100644 (file)
--- a/testsuite/reftests/animation-fill-mode-iteration-count.ref.ui
+++ b/testsuite/reftests/animation-fill-mode-iteration-count.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.16"/>
+  <requires lib="gtk" version="3.16"/>
   <object class="GtkWindow" id="window1">
     <child>
       <object class="GtkGrid" id="grid1">

diff --git a/testsuite/reftests/animation-fill-mode-iteration-count.ui b/testsuite/reftests/animation-fill-mode-iteration-count.ui
index 4b58c08af1263ea5e4debc5ea7d855bf34d2c2d2..9be4fb3a109434c510526c7a2ff4a0bce64c77ce 100644 (file)
--- a/testsuite/reftests/animation-fill-mode-iteration-count.ui
+++ b/testsuite/reftests/animation-fill-mode-iteration-count.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.16"/>
+  <requires lib="gtk" version="3.16"/>
   <object class="GtkWindow" id="window1">
     <child>
       <object class="GtkGrid" id="grid1">

diff --git a/testsuite/reftests/border-corner-zero-width-rendering.ref.ui b/testsuite/reftests/border-corner-zero-width-rendering.ref.ui
index 2b111b68558c9c602ee212b07583ffb834b34e88..f5e20bd5888be0160853e1541ac126686609cf11 100644 (file)
--- a/testsuite/reftests/border-corner-zero-width-rendering.ref.ui
+++ b/testsuite/reftests/border-corner-zero-width-rendering.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
     <child>

diff --git a/testsuite/reftests/border-corner-zero-width-rendering.ui b/testsuite/reftests/border-corner-zero-width-rendering.ui
index 21c1f7e72dcf0b3c704a0a396f0105b6204d8d43..f0347c5c40229eaa8bf928307686241e4b6cc707 100644 (file)
--- a/testsuite/reftests/border-corner-zero-width-rendering.ui
+++ b/testsuite/reftests/border-corner-zero-width-rendering.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
     <child>

diff --git a/testsuite/reftests/box-order.ref.ui b/testsuite/reftests/box-order.ref.ui
index 5cf8975e94f428a566ff98e344e978d5878b11c7..c9f791c2e2530f9cb15b05b0b0dbbbea4fa6aa26 100644 (file)
--- a/testsuite/reftests/box-order.ref.ui
+++ b/testsuite/reftests/box-order.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
     <child>

diff --git a/testsuite/reftests/box-order.ui b/testsuite/reftests/box-order.ui
index 1e1f18b07beec7eae45864ec20138364772a5002..540d61a3c1273fcd90813ba721d68ed4260db89b 100644 (file)
--- a/testsuite/reftests/box-order.ui
+++ b/testsuite/reftests/box-order.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
     <child>

diff --git a/testsuite/reftests/box-shadow-changes-modify-clip.ref.ui b/testsuite/reftests/box-shadow-changes-modify-clip.ref.ui
index fbcf49592303d20dac4cc0aca9346d02628652f2..5ba631adb166c1bae7782a54c088940d237ceaa9 100644 (file)
--- a/testsuite/reftests/box-shadow-changes-modify-clip.ref.ui
+++ b/testsuite/reftests/box-shadow-changes-modify-clip.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">500</property>
     <property name="height_request">100</property>

diff --git a/testsuite/reftests/box-shadow-changes-modify-clip.ui b/testsuite/reftests/box-shadow-changes-modify-clip.ui
index 091354528800b1e85c0a63d94438622905a266ea..b5256033c1d911e000b5b6393100c5b94eb0fe26 100644 (file)
--- a/testsuite/reftests/box-shadow-changes-modify-clip.ui
+++ b/testsuite/reftests/box-shadow-changes-modify-clip.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">500</property>
     <property name="height_request">100</property>

diff --git a/testsuite/reftests/box-shadow-spread.ref.ui b/testsuite/reftests/box-shadow-spread.ref.ui
index 0303ab9ebb238f0960a72be56123428390a4ea76..1b77f6e34dd62fb9ba00bc264a4597019b1e2cc8 100644 (file)
--- a/testsuite/reftests/box-shadow-spread.ref.ui
+++ b/testsuite/reftests/box-shadow-spread.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">100</property>
     <property name="height_request">100</property>

diff --git a/testsuite/reftests/box-shadow-spread.ui b/testsuite/reftests/box-shadow-spread.ui
index 216df0d516dee0c0fc3734fca85e3188f5960d33..fb9e974b71eaf25616b5dc08605785530cce53f9 100644 (file)
--- a/testsuite/reftests/box-shadow-spread.ui
+++ b/testsuite/reftests/box-shadow-spread.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">100</property>
     <property name="height_request">100</property>

diff --git a/testsuite/reftests/box-shadow-with-blend-mode.ref.ui b/testsuite/reftests/box-shadow-with-blend-mode.ref.ui
index a553811ca644b5f0bbf122f1f42ab85887455ba8..f23658f21ef970f77a6a3ebf104c7e48bf49f4ed 100644 (file)
--- a/testsuite/reftests/box-shadow-with-blend-mode.ref.ui
+++ b/testsuite/reftests/box-shadow-with-blend-mode.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.16"/>
+  <requires lib="gtk" version="3.16"/>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
     <child>

diff --git a/testsuite/reftests/box-shadow-with-blend-mode.ui b/testsuite/reftests/box-shadow-with-blend-mode.ui
index b53fad608ea3b90e179422e54d9981ec84dcd96d..901343a6d7dd4ee390184a0c551051949eaeeae6 100644 (file)
--- a/testsuite/reftests/box-shadow-with-blend-mode.ui
+++ b/testsuite/reftests/box-shadow-with-blend-mode.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.16"/>
+  <requires lib="gtk" version="3.16"/>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
     <child>

diff --git a/testsuite/reftests/css-em-label-size.ref.ui b/testsuite/reftests/css-em-label-size.ref.ui
index 85f4f830692af0214e344e4f05fdc3135c42fa31..da39cbbc38789446dd1b6b650f872b3cdd150a2b 100644 (file)
--- a/testsuite/reftests/css-em-label-size.ref.ui
+++ b/testsuite/reftests/css-em-label-size.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.20"/>
+  <requires lib="gtk" version="3.20"/>
   <object class="GtkWindow">
     <property name="decorated">0</property>
     <child>

diff --git a/testsuite/reftests/css-em-label-size.ui b/testsuite/reftests/css-em-label-size.ui
index fa89508222c5f9f2be0f6f935971ba37d11357cd..f9645bb4943509a0ce24656c9a6cef87b4adb3ed 100644 (file)
--- a/testsuite/reftests/css-em-label-size.ui
+++ b/testsuite/reftests/css-em-label-size.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.20"/>
+  <requires lib="gtk" version="3.20"/>
   <object class="GtkWindow">
     <property name="decorated">0</property>
     <child>

diff --git a/testsuite/reftests/css-rem-label-size.ref.ui b/testsuite/reftests/css-rem-label-size.ref.ui
index 85fe92601c09343720506ca44142ef8d4e2f3f1a..d87f5c4d6a402ce38f537a78e76e00ef22aee3c5 100644 (file)
--- a/testsuite/reftests/css-rem-label-size.ref.ui
+++ b/testsuite/reftests/css-rem-label-size.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.20"/>
+  <requires lib="gtk" version="3.20"/>
   <object class="GtkWindow">
     <property name="decorated">0</property>
     <child>

diff --git a/testsuite/reftests/css-rem-label-size.ui b/testsuite/reftests/css-rem-label-size.ui
index b3579624e8221d311f9db0457ba8aed8c2899a23..8ce8de1bc41625fbd51b38db149216552cbc0dd5 100644 (file)
--- a/testsuite/reftests/css-rem-label-size.ui
+++ b/testsuite/reftests/css-rem-label-size.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.20"/>
+  <requires lib="gtk" version="3.20"/>
   <object class="GtkWindow">
     <property name="decorated">0</property>
     <child>

diff --git a/testsuite/reftests/flipping-icons.ref.ui b/testsuite/reftests/flipping-icons.ref.ui
index 4116f128382f181b03d5fef133d2ad08e1d34ca1..c5c1a6a3a3cc399c4f8efcef5342a33b222b595f 100644 (file)
--- a/testsuite/reftests/flipping-icons.ref.ui
+++ b/testsuite/reftests/flipping-icons.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
     <child>

diff --git a/testsuite/reftests/flipping-icons.ui b/testsuite/reftests/flipping-icons.ui
index 688c1495bd52a8ce10f3a34d395bc1f94d9c1bb3..6b29bdd365c1de8b5f09f5ee8eb06ad11489f1cb 100644 (file)
--- a/testsuite/reftests/flipping-icons.ui
+++ b/testsuite/reftests/flipping-icons.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
     <signal name="map" handler="reftest:switch_default_direction" swapped="no"/>

diff --git a/testsuite/reftests/gtk-icontheme-sizing.ref.ui b/testsuite/reftests/gtk-icontheme-sizing.ref.ui
index 800b02e63dff86138d0fecc2fc74dd08915d4d26..25cfdc0cded9242861f836d573ffdba4738436c7 100644 (file)
--- a/testsuite/reftests/gtk-icontheme-sizing.ref.ui
+++ b/testsuite/reftests/gtk-icontheme-sizing.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
     <child>

diff --git a/testsuite/reftests/gtk-icontheme-sizing.ui b/testsuite/reftests/gtk-icontheme-sizing.ui
index 714c9cee827c3e5918eb77088e2f04ad221562d6..0402f29e5668203936a5e9a7f4c54da039d58130 100644 (file)
--- a/testsuite/reftests/gtk-icontheme-sizing.ui
+++ b/testsuite/reftests/gtk-icontheme-sizing.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">100</property>
     <property name="height_request">100</property>

diff --git a/testsuite/reftests/icon-effect-missing.ref.ui b/testsuite/reftests/icon-effect-missing.ref.ui
index ee9b2657c72c68a8ba8721e784e741c5a2a1fb0b..ef72d2e81499603826da0dec8eed561e895e2961 100644 (file)
--- a/testsuite/reftests/icon-effect-missing.ref.ui
+++ b/testsuite/reftests/icon-effect-missing.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.16"/>
+  <requires lib="gtk" version="3.16"/>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
     <child>

diff --git a/testsuite/reftests/icon-effect-missing.ui b/testsuite/reftests/icon-effect-missing.ui
index 7d77f96e2f10ed83991355a6ab55fe91f86b1d85..0c77e67a4944bfbd34e88139e6ae85ce2f34280c 100644 (file)
--- a/testsuite/reftests/icon-effect-missing.ui
+++ b/testsuite/reftests/icon-effect-missing.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.16"/>
+  <requires lib="gtk" version="3.16"/>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
     <child>

diff --git a/testsuite/reftests/icon-shadow-no-transform.ref.ui b/testsuite/reftests/icon-shadow-no-transform.ref.ui
index 51ecb0a95d276b22c3ccc20fb377f8474b66e7f8..1662810a6bd4c9e179144f5ff2063d569b81b1e0 100644 (file)
--- a/testsuite/reftests/icon-shadow-no-transform.ref.ui
+++ b/testsuite/reftests/icon-shadow-no-transform.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
     <child>

diff --git a/testsuite/reftests/icon-shadow-no-transform.ui b/testsuite/reftests/icon-shadow-no-transform.ui
index 3c4b93831f1f16c72c611d760ef720bc3676420f..2a2304de0d30d208d829254692689867e39ead17 100644 (file)
--- a/testsuite/reftests/icon-shadow-no-transform.ui
+++ b/testsuite/reftests/icon-shadow-no-transform.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
     <child>

diff --git a/testsuite/reftests/icon-style-basics.ref.ui b/testsuite/reftests/icon-style-basics.ref.ui
index 55301e93e4a66e7799ea60a359a97e7b1b3f340b..14909e77251ba455adddb6efd8d6652eb9ebbfcf 100644 (file)
--- a/testsuite/reftests/icon-style-basics.ref.ui
+++ b/testsuite/reftests/icon-style-basics.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkListStore" id="liststore1">
     <columns>
       <column type="gchararray"/>

diff --git a/testsuite/reftests/icon-style-basics.ui b/testsuite/reftests/icon-style-basics.ui
index 0b79f497c9c65302bba23521c5a5949458f56609..96635da0caae964d937092ed7106d5542433d678 100644 (file)
--- a/testsuite/reftests/icon-style-basics.ui
+++ b/testsuite/reftests/icon-style-basics.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkListStore" id="liststore1">
     <columns>
       <column type="gchararray"/>

diff --git a/testsuite/reftests/icon-vfuncs.ref.ui b/testsuite/reftests/icon-vfuncs.ref.ui
index 4d625e994545d9f07285dde9b248bcd3ab662357..9dc5ab868f6b2384f9cb7359c23480c10dfd7ff2 100644 (file)
--- a/testsuite/reftests/icon-vfuncs.ref.ui
+++ b/testsuite/reftests/icon-vfuncs.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <child>
       <object class="GtkGrid" id="grid1">

diff --git a/testsuite/reftests/icon-vfuncs.ui b/testsuite/reftests/icon-vfuncs.ui
index 1d7bd31bbed25aa9f79eff1460742ff676ac5fce..4418843600e0f54f8b6894c9ea4d59f537ea7de0 100644 (file)
--- a/testsuite/reftests/icon-vfuncs.ui
+++ b/testsuite/reftests/icon-vfuncs.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <child>
       <object class="GtkGrid" id="grid1">

diff --git a/testsuite/reftests/image-icon-name-use-fallback.ref.ui b/testsuite/reftests/image-icon-name-use-fallback.ref.ui
index 49815a302a4b4ac24950f93ba25b1e227ddcd172..61b4d818645d9e667f6f79496ec553f53225f612 100644 (file)
--- a/testsuite/reftests/image-icon-name-use-fallback.ref.ui
+++ b/testsuite/reftests/image-icon-name-use-fallback.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.10"/>
+  <requires lib="gtk" version="3.10"/>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
     <child>

diff --git a/testsuite/reftests/image-icon-name-use-fallback.ui b/testsuite/reftests/image-icon-name-use-fallback.ui
index b353ed4721f258f0353f0e9fa8fef4d1aa36d278..d7db5642d3717463b81ecddce1a640c0fd875d16 100644 (file)
--- a/testsuite/reftests/image-icon-name-use-fallback.ui
+++ b/testsuite/reftests/image-icon-name-use-fallback.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.10"/>
+  <requires lib="gtk" version="3.10"/>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
     <child>

diff --git a/testsuite/reftests/image-icon-shadow-clipping.ref.ui b/testsuite/reftests/image-icon-shadow-clipping.ref.ui
index 36813408f996dd6b5412ede2d33c0dcc18639dbf..4b31d9a118e48dde068c5f456d376650e11d12f1 100644 (file)
--- a/testsuite/reftests/image-icon-shadow-clipping.ref.ui
+++ b/testsuite/reftests/image-icon-shadow-clipping.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">100</property>
     <property name="height_request">100</property>

diff --git a/testsuite/reftests/image-icon-shadow-clipping.ui b/testsuite/reftests/image-icon-shadow-clipping.ui
index fa151544fabfac654b05280a468b25c979dd9627..e522387360a654c6e4ddfea3f529ef9657c1dbc4 100644 (file)
--- a/testsuite/reftests/image-icon-shadow-clipping.ui
+++ b/testsuite/reftests/image-icon-shadow-clipping.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">100</property>
     <property name="height_request">100</property>

diff --git a/testsuite/reftests/label-background.ref.ui b/testsuite/reftests/label-background.ref.ui
index e6a46ecbb826b87225b3bbf645ba42f7f291bcb9..510f7bfb30e57eb5a927c8ca4959b2cbdcf64aad 100644 (file)
--- a/testsuite/reftests/label-background.ref.ui
+++ b/testsuite/reftests/label-background.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
     <child>

diff --git a/testsuite/reftests/label-background.ui b/testsuite/reftests/label-background.ui
index e2665bd2eb1cf20a31eff5fb40b96ec269ac5cd8..88e44a4187390e2e4f2327cf7694abec797e4451 100644 (file)
--- a/testsuite/reftests/label-background.ui
+++ b/testsuite/reftests/label-background.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
     <child>

diff --git a/testsuite/reftests/label-box-shadow-clip.ref.ui b/testsuite/reftests/label-box-shadow-clip.ref.ui
index b6b0b04041857c34995f4a2b4770a900a5491623..ff9d0e22cf7ef93c782c65eea256c5c672affdc6 100644 (file)
--- a/testsuite/reftests/label-box-shadow-clip.ref.ui
+++ b/testsuite/reftests/label-box-shadow-clip.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">100</property>
     <property name="height_request">100</property>

diff --git a/testsuite/reftests/label-box-shadow-clip.ui b/testsuite/reftests/label-box-shadow-clip.ui
index 0047f8c25e1b53bc4214127f82a2cf94c8e10d29..6aac63068b8c0e0c8b0c02baf4610f30d297d0d4 100644 (file)
--- a/testsuite/reftests/label-box-shadow-clip.ui
+++ b/testsuite/reftests/label-box-shadow-clip.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">100</property>
     <property name="height_request">100</property>

diff --git a/testsuite/reftests/label-clipping.ref.ui b/testsuite/reftests/label-clipping.ref.ui
index 83db89675732ac50acffada28a7638844dcfbd5a..16d59f209e07cbbc5eaafefbc855f9a199431e91 100644 (file)
--- a/testsuite/reftests/label-clipping.ref.ui
+++ b/testsuite/reftests/label-clipping.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">500</property>
     <property name="decorated">0</property>

diff --git a/testsuite/reftests/label-clipping.ui b/testsuite/reftests/label-clipping.ui
index 45c6ca8138c5f43871344d062ad395ab3cb89518..50e40b0b599f425e18fef2284927d449bcab84db 100644 (file)
--- a/testsuite/reftests/label-clipping.ui
+++ b/testsuite/reftests/label-clipping.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">500</property>
     <property name="decorated">0</property>

diff --git a/testsuite/reftests/label-text-shadow-changes-modify-clip.ref.ui b/testsuite/reftests/label-text-shadow-changes-modify-clip.ref.ui
index 73b8efb450c8469ab9d09d159179217cf9e5f62a..efc0adc07136ec779369cd2b1abbaec3779539c5 100644 (file)
--- a/testsuite/reftests/label-text-shadow-changes-modify-clip.ref.ui
+++ b/testsuite/reftests/label-text-shadow-changes-modify-clip.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">500</property>
     <property name="height_request">100</property>

diff --git a/testsuite/reftests/label-text-shadow-changes-modify-clip.ui b/testsuite/reftests/label-text-shadow-changes-modify-clip.ui
index 091354528800b1e85c0a63d94438622905a266ea..b5256033c1d911e000b5b6393100c5b94eb0fe26 100644 (file)
--- a/testsuite/reftests/label-text-shadow-changes-modify-clip.ui
+++ b/testsuite/reftests/label-text-shadow-changes-modify-clip.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">500</property>
     <property name="height_request">100</property>

diff --git a/testsuite/reftests/label-text-shadow-clipping.ref.ui b/testsuite/reftests/label-text-shadow-clipping.ref.ui
index 2d15374f73d38e4f8577c42b8cc4cd0d45e5ac95..223e9fe609e1acb3eaa30aeee2e62f173396ab55 100644 (file)
--- a/testsuite/reftests/label-text-shadow-clipping.ref.ui
+++ b/testsuite/reftests/label-text-shadow-clipping.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">500</property>
     <property name="height_request">100</property>

diff --git a/testsuite/reftests/label-text-shadow-clipping.ui b/testsuite/reftests/label-text-shadow-clipping.ui
index 5b581f82774b7217b605bc24064f7f10244075cb..f40d4dc6a881dc8f5005abc7f81cd4a2cbfb13c7 100644 (file)
--- a/testsuite/reftests/label-text-shadow-clipping.ui
+++ b/testsuite/reftests/label-text-shadow-clipping.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">500</property>
     <property name="height_request">100</property>

diff --git a/testsuite/reftests/letter-spacing.ref.ui b/testsuite/reftests/letter-spacing.ref.ui
index dbd264b6ed5ec97741335006dedcbbdd1e059bc7..c66515c4009f1ee3194421849ae0a90c068f0796 100644 (file)
--- a/testsuite/reftests/letter-spacing.ref.ui
+++ b/testsuite/reftests/letter-spacing.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.0"/>
+  <requires lib="gtk" version="3.0"/>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
     <child>

diff --git a/testsuite/reftests/notebook-tab-position.ref.ui b/testsuite/reftests/notebook-tab-position.ref.ui
index b8b636f9356e6907f6e2334de503af0efc8f9331..05d46b19ed75dbbfb69afe1f51ccbcd32fec0cbf 100644 (file)
--- a/testsuite/reftests/notebook-tab-position.ref.ui
+++ b/testsuite/reftests/notebook-tab-position.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
     <child>

diff --git a/testsuite/reftests/notebook-tab-position.ui b/testsuite/reftests/notebook-tab-position.ui
index c164a20961e8c03c778cdd45fbad2fb6f8fe1a4e..eb1b5e8c49bfe2673510055611dafc31c8cf2bd4 100644 (file)
--- a/testsuite/reftests/notebook-tab-position.ui
+++ b/testsuite/reftests/notebook-tab-position.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
     <child>

diff --git a/testsuite/reftests/opacity-initial.ref.ui b/testsuite/reftests/opacity-initial.ref.ui
index 32b8fc9bb5724b3d95259e0d39ccd4da1af4e91d..a981ad3770d8a69c4f95d8c7d11b4f3ca4411d1a 100644 (file)
--- a/testsuite/reftests/opacity-initial.ref.ui
+++ b/testsuite/reftests/opacity-initial.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">200</property>
     <property name="height_request">100</property>

diff --git a/testsuite/reftests/opacity-initial.ui b/testsuite/reftests/opacity-initial.ui
index e3116565b21accb234c0eca21c019e3edddad81a..8c7d7427559523b9feb967bbef68942799cadb01 100644 (file)
--- a/testsuite/reftests/opacity-initial.ui
+++ b/testsuite/reftests/opacity-initial.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">200</property>
     <property name="height_request">100</property>

diff --git a/testsuite/reftests/overlay-no-main-widget.ref.ui b/testsuite/reftests/overlay-no-main-widget.ref.ui
index 8327429142a43235426c629d32bfcad5f813834a..b80fd216fdc608d789cf0448123103a69b862454 100644 (file)
--- a/testsuite/reftests/overlay-no-main-widget.ref.ui
+++ b/testsuite/reftests/overlay-no-main-widget.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <child>
       <object class="GtkOverlay" id="overlay1">

diff --git a/testsuite/reftests/overlay-no-main-widget.ui b/testsuite/reftests/overlay-no-main-widget.ui
index eaca0f2d0f048141ce673ae34f4339b5ef16627f..d4ccf93ed0aab2f0a67f35463cfe3cbaa52b76b9 100644 (file)
--- a/testsuite/reftests/overlay-no-main-widget.ui
+++ b/testsuite/reftests/overlay-no-main-widget.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <child>
       <object class="GtkOverlay" id="overlay1">

diff --git a/testsuite/reftests/pseudoclass-on-box.ref.ui b/testsuite/reftests/pseudoclass-on-box.ref.ui
index 375e83f54ce0304aca85ce16a633e02ebdabd878..89d8b55d3e671e29e300256a800b4794e45e2cee 100644 (file)
--- a/testsuite/reftests/pseudoclass-on-box.ref.ui
+++ b/testsuite/reftests/pseudoclass-on-box.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
     <child>

diff --git a/testsuite/reftests/pseudoclass-on-box.ui b/testsuite/reftests/pseudoclass-on-box.ui
index e16fdf911e769886aa16391c5ba70492ac1e8e26..b5edee7defca14abf307f5bbff44556d72a3d79a 100644 (file)
--- a/testsuite/reftests/pseudoclass-on-box.ui
+++ b/testsuite/reftests/pseudoclass-on-box.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
     <child>

diff --git a/testsuite/reftests/pseudoclass-on-parent.ref.ui b/testsuite/reftests/pseudoclass-on-parent.ref.ui
index c9933fda8e4fa397e7daa68f73885c97dea085e8..b6374178a90e933bb71a782725c47d9b8f924036 100644 (file)
--- a/testsuite/reftests/pseudoclass-on-parent.ref.ui
+++ b/testsuite/reftests/pseudoclass-on-parent.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
     <child>

diff --git a/testsuite/reftests/pseudoclass-on-parent.ui b/testsuite/reftests/pseudoclass-on-parent.ui
index beccde56d032abed38885d2e7dceda772a5ae5fe..2d6e90a0f540a3a4081b2c958a60daa47f3013d7 100644 (file)
--- a/testsuite/reftests/pseudoclass-on-parent.ui
+++ b/testsuite/reftests/pseudoclass-on-parent.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
     <child>

diff --git a/testsuite/reftests/set-default-direction.ref.ui b/testsuite/reftests/set-default-direction.ref.ui
index d54ff23ba8d1b93f4f6352e5882516a9af379945..d716864ca96f82eac8dde709ff24af3555ecf2ce 100644 (file)
--- a/testsuite/reftests/set-default-direction.ref.ui
+++ b/testsuite/reftests/set-default-direction.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
     <signal name="realize" handler="reftest:switch_default_direction" after="yes" swapped="no"/>

diff --git a/testsuite/reftests/set-default-direction.ui b/testsuite/reftests/set-default-direction.ui
index 80a013e57dc02928c20ddfd966f6c27e0be51488..5e6b00464510c875ae7e97c32228c2c79a8c303b 100644 (file)
--- a/testsuite/reftests/set-default-direction.ui
+++ b/testsuite/reftests/set-default-direction.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
     <signal name="map" handler="reftest:switch_default_direction" swapped="no"/>

diff --git a/testsuite/reftests/shadow-clip-rounding.ref.ui b/testsuite/reftests/shadow-clip-rounding.ref.ui
index b6b0b04041857c34995f4a2b4770a900a5491623..ff9d0e22cf7ef93c782c65eea256c5c672affdc6 100644 (file)
--- a/testsuite/reftests/shadow-clip-rounding.ref.ui
+++ b/testsuite/reftests/shadow-clip-rounding.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">100</property>
     <property name="height_request">100</property>

diff --git a/testsuite/reftests/shadow-clip-rounding.ui b/testsuite/reftests/shadow-clip-rounding.ui
index 0047f8c25e1b53bc4214127f82a2cf94c8e10d29..6aac63068b8c0e0c8b0c02baf4610f30d297d0d4 100644 (file)
--- a/testsuite/reftests/shadow-clip-rounding.ui
+++ b/testsuite/reftests/shadow-clip-rounding.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">100</property>
     <property name="height_request">100</property>

diff --git a/testsuite/reftests/sibling-pseudoclasses.ref.ui b/testsuite/reftests/sibling-pseudoclasses.ref.ui
index 0ec480703a4c418a83d29f20ecd493f202f534f6..8ab7a1a3c6e5f97d0d119c61b0a10d4fe872099e 100644 (file)
--- a/testsuite/reftests/sibling-pseudoclasses.ref.ui
+++ b/testsuite/reftests/sibling-pseudoclasses.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <child>
       <object class="GtkBox" id="box1">

diff --git a/testsuite/reftests/sibling-pseudoclasses.ui b/testsuite/reftests/sibling-pseudoclasses.ui
index f22e0cc63f75b48294dc4ad4c202d4f2ba0cee70..9d97a17508c18563d4873b07bb8da5202eae1610 100644 (file)
--- a/testsuite/reftests/sibling-pseudoclasses.ui
+++ b/testsuite/reftests/sibling-pseudoclasses.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <child>
       <object class="GtkBox" id="box1">

diff --git a/testsuite/reftests/statusbar-remove-all.ref.ui b/testsuite/reftests/statusbar-remove-all.ref.ui
index 6bda5b39223f69c5a261dc2ad490d52e9da86796..3d42c2ac9e5d2e8d5c316f7df5e6f36078e5de0a 100644 (file)
--- a/testsuite/reftests/statusbar-remove-all.ref.ui
+++ b/testsuite/reftests/statusbar-remove-all.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
     <child>

diff --git a/testsuite/reftests/statusbar-remove-all.ui b/testsuite/reftests/statusbar-remove-all.ui
index 0baf34621ec82e160dc4c53ae7a39041398878e3..150ea55fc81a830ecce3d42449a90ca79f6cff95 100644 (file)
--- a/testsuite/reftests/statusbar-remove-all.ui
+++ b/testsuite/reftests/statusbar-remove-all.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
     <child>

diff --git a/testsuite/reftests/style-context-save-inheritance.ref.ui b/testsuite/reftests/style-context-save-inheritance.ref.ui
index d3745e4bd7ce3a5c8ecd75d6ab6408b8432f85b5..26d34cef95edafb84d48702e67b0fff3e349fca3 100644 (file)
--- a/testsuite/reftests/style-context-save-inheritance.ref.ui
+++ b/testsuite/reftests/style-context-save-inheritance.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
     <child>

diff --git a/testsuite/reftests/style-context-save-inheritance.ui b/testsuite/reftests/style-context-save-inheritance.ui
index c05849086920e58c0ce16328617472186bb4e7b3..bd450ff7d28036dafa6ac726bb00c4fd30caefd6 100644 (file)
--- a/testsuite/reftests/style-context-save-inheritance.ui
+++ b/testsuite/reftests/style-context-save-inheritance.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
     <child>

diff --git a/testsuite/reftests/textview-border-windows.ref.ui b/testsuite/reftests/textview-border-windows.ref.ui
index 1bb083dad4528b2ad9f8c70cbe07154c343ef9bd..ddd5064a7840e32e28283cff2a924bd7cdb7c012 100644 (file)
--- a/testsuite/reftests/textview-border-windows.ref.ui
+++ b/testsuite/reftests/textview-border-windows.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.0"/>
+  <requires lib="gtk" version="3.0"/>
   <object class="GtkWindow" id="window">
     <property name="decorated">0</property>
     <child>

diff --git a/testsuite/reftests/textview-border-windows.ui b/testsuite/reftests/textview-border-windows.ui
index dc51f0091ed58905b26dd4a7a77f4939f855d024..69d0142e914afb763eeeed9ab6f2a4a7ff3a09e9 100644 (file)
--- a/testsuite/reftests/textview-border-windows.ui
+++ b/testsuite/reftests/textview-border-windows.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.0"/>
+  <requires lib="gtk" version="3.0"/>
   <object class="GtkWindow" id="window">
     <property name="decorated">0</property>
     <child>

diff --git a/testsuite/reftests/textview-margins.ref.ui b/testsuite/reftests/textview-margins.ref.ui
index 190201d3a57a21f74408c9e7cbe3e39e692fbc51..8d455b11c54cac1b9ee0fbfe9756980063f168be 100644 (file)
--- a/testsuite/reftests/textview-margins.ref.ui
+++ b/testsuite/reftests/textview-margins.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.0"/>
+  <requires lib="gtk" version="3.0"/>
   <object class="GtkTextBuffer" id="textbuffer1">
     <property name="text" translatable="yes">Lorem ipsum dolor sit amet, consectetur adipisci elit, sed eiusmod tempor incidunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquid ex ea commodi consequat. Quis aute iure reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint obcaecat cupiditat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum</property>
   </object>

diff --git a/testsuite/reftests/textview-margins.ui b/testsuite/reftests/textview-margins.ui
index 93dd2ab9c238eb15abe7bc79e0bbecb3c3b1e8cd..6403d040dae9ef12bd28fbbe25963cf0a1bc2beb 100644 (file)
--- a/testsuite/reftests/textview-margins.ui
+++ b/testsuite/reftests/textview-margins.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.0"/>
+  <requires lib="gtk" version="3.0"/>
   <object class="GtkTextBuffer" id="textbuffer1">
     <property name="text" translatable="yes">Lorem ipsum dolor sit amet, consectetur adipisci elit, sed eiusmod tempor incidunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquid ex ea commodi consequat. Quis aute iure reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint obcaecat cupiditat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum</property>
   </object>

diff --git a/testsuite/reftests/treeview-crash-too-wide.ref.ui b/testsuite/reftests/treeview-crash-too-wide.ref.ui
index ad9eb85c614f286400989848bc4eabe5800ed644..33825a95dbe684c557010c25c308e58ec1357ee7 100644 (file)
--- a/testsuite/reftests/treeview-crash-too-wide.ref.ui
+++ b/testsuite/reftests/treeview-crash-too-wide.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkListStore" id="liststore1">
     <columns>
       <column type="gchararray"/>

diff --git a/testsuite/reftests/treeview-crash-too-wide.ui b/testsuite/reftests/treeview-crash-too-wide.ui
index ad9eb85c614f286400989848bc4eabe5800ed644..33825a95dbe684c557010c25c308e58ec1357ee7 100644 (file)
--- a/testsuite/reftests/treeview-crash-too-wide.ui
+++ b/testsuite/reftests/treeview-crash-too-wide.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkListStore" id="liststore1">
     <columns>
       <column type="gchararray"/>

diff --git a/testsuite/reftests/window-show-contents-on-map.ref.ui b/testsuite/reftests/window-show-contents-on-map.ref.ui
index d074202b0871967972548e589a6e0ff9a89502cd..1cc91f827e75c3669762cce12991696d97c21d9f 100644 (file)
--- a/testsuite/reftests/window-show-contents-on-map.ref.ui
+++ b/testsuite/reftests/window-show-contents-on-map.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">200</property>
     <property name="height_request">200</property>

diff --git a/testsuite/reftests/window-show-contents-on-map.ui b/testsuite/reftests/window-show-contents-on-map.ui
index ec617ace225c5c26fd0dc4ea6d6efd640e019f45..22d773b79f8d8457be91b7f63508402463aa971e 100644 (file)
--- a/testsuite/reftests/window-show-contents-on-map.ui
+++ b/testsuite/reftests/window-show-contents-on-map.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
     <signal name="map" handler="gtk_widget_show" object="label1" after="yes" swapped="yes"/>

diff --git a/testsuite/tools/simplify-data-3to4/actionbar.expected b/testsuite/tools/simplify-data-3to4/actionbar.expected
index a063c7f2b69a818144410830158670a9839232cd..8afe4c83fe9b1635245a1147d887ce41bead054c 100644 (file)
--- a/testsuite/tools/simplify-data-3to4/actionbar.expected
+++ b/testsuite/tools/simplify-data-3to4/actionbar.expected
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.0"/>
+  <requires lib="gtk" version="3.0"/>
   <object class="GtkActionBar">
     <property name="visible">0</property>
     <child type="start">

diff --git a/testsuite/tools/simplify-data-3to4/box.expected b/testsuite/tools/simplify-data-3to4/box.expected
index 9f62a3b09ea3735692185fa3d8e29a8495fde0ba..6f0d194bc8850694e3897131d6ef77236ed9669d 100644 (file)
--- a/testsuite/tools/simplify-data-3to4/box.expected
+++ b/testsuite/tools/simplify-data-3to4/box.expected
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.0"/>
+  <requires lib="gtk" version="3.0"/>
   <object class="GtkWindow">
     <property name="child">
       <object class="GtkBox">

diff --git a/testsuite/tools/simplify-data-3to4/fixed.expected b/testsuite/tools/simplify-data-3to4/fixed.expected
index 74953b12c61acb482b196eec8decc9abbb91bd26..2b18a84b1bdf99418ea70a0034782378f167540a 100644 (file)
--- a/testsuite/tools/simplify-data-3to4/fixed.expected
+++ b/testsuite/tools/simplify-data-3to4/fixed.expected
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.0"/>
+  <requires lib="gtk" version="3.0"/>
   <object class="GtkFixed">
     <child>
       <object class="GtkButton" id="button">

diff --git a/testsuite/tools/simplify-data-3to4/overlay.expected b/testsuite/tools/simplify-data-3to4/overlay.expected
index 67e6ccade180ea7bcea1ece55704a3cdaa2fd524..a37d2ab8b568637ddf2062feb7c68bfbb705cfb4 100644 (file)
--- a/testsuite/tools/simplify-data-3to4/overlay.expected
+++ b/testsuite/tools/simplify-data-3to4/overlay.expected
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.0"/>
+  <requires lib="gtk" version="3.0"/>
   <object class="GtkOverlay">
     <child type="overlay">
       <object class="GtkButton" id="button">

diff --git a/testsuite/tools/simplify-data-3to4/paned.expected b/testsuite/tools/simplify-data-3to4/paned.expected
index a1acaae44231343f8091d1222106da5ca41edd35..a868fd2fd4b1e20b1f9a5a3b0a85f7cf992f6beb 100644 (file)
--- a/testsuite/tools/simplify-data-3to4/paned.expected
+++ b/testsuite/tools/simplify-data-3to4/paned.expected
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.0"/>
+  <requires lib="gtk" version="3.0"/>
   <object class="GtkPaned">
     <property name="resize-end-child">0</property>
     <property name="shrink-start-child">0</property>

diff --git a/testsuite/tools/simplify-data-3to4/toolbar.expected b/testsuite/tools/simplify-data-3to4/toolbar.expected
index fa090a92844715293f2aa8f6796ce7d56f86db17..8fa1e1edfc79a8dbf0d81c238b69c718f1ecacf7 100644 (file)
--- a/testsuite/tools/simplify-data-3to4/toolbar.expected
+++ b/testsuite/tools/simplify-data-3to4/toolbar.expected
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.0"/>
+  <requires lib="gtk" version="3.0"/>
   <object class="GtkBox">
     <style>
       <class name="toolbar"/>